Latest shared
Merge pull request #102 from khawkins/master

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

Conflicts:
	HybridShared
Merge pull request #103 from khawkins/unstable_merge

Merging master back to unstable