am d2bfa3bd: Merge "Fix copy constructor" into jb-mr2-dev

* commit 'd2bfa3bdc0a5d3c06cde2711d8572a8141e45fe2':
  Fix copy constructor