Merge "Teach sp<> how to std::move" am: 518d043c86
am: bb12b91ae1

* commit 'bb12b91ae1e3caf83e1d775d4e823d82b2336a37':
  Teach sp<> how to std::move