Latest shared
Merge pull request #765 from khawkins/master

Latest shared
Merge remote-tracking branch 'upstream/master' into unstable_merge

Conflicts:
	external/shared
Merge pull request #766 from khawkins/unstable_merge

Merging master back to unstable