Latest shared
Merge pull request #863 from khawkins/master

Latest shared
Merge remote-tracking branch 'upstream/master' into unstable_merge
Merge pull request #864 from khawkins/unstable_merge

Merging master back to unstable