shared -> master
Merge remote-tracking branch 'origin/master' into amutake

Conflicts:
	shared