Develop

Merge commit back to master. 
Synchronizes with OT/OT develop->master 0.92.b.
Fixes and updates only.