Merge remote-tracking branch 'origin/RC20140821' into release-candidate

* origin/RC20140821:
Merge branch 'RC20140821' into release-candidate