v4.11-9506-beta
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into hideki-release

Conflicts:
	src/Cedar/Cedar.h