Latest shared
Merge pull request #872 from khawkins/latest_shared

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

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

Merging master back to unstable