Merge pull request #421 from bhariharan/unstable

Merge 'master' into unstable
Latest shared
Merge pull request #424 from bhariharan/master

Latest shared
Merge branch 'master' into unstable

Conflicts:
	external/shared