Merge from branch 'develop' into 'master'

1. Update make_shared for arrays to conform to N3870

Merging 630e4f49f3^..87e5debdc2 from develop to master
Revert "Merge from branch 'develop' into 'master'"

This reverts commit 83b3b703e0e728c6e911c9a04cc337656bae7b8f.
Merge branch 'develop'