Merge remote-tracking branch 'origin/master' into cdh3
Merge remote-tracking branch 'origin/cdh3' into cdh3-publish