Merge branch 'master' into cpp/all

Conflicts:
	cpp/src/keyczar/data
Merge branch 'submodulebase' into cpp/all