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

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

* origin/RC20140821: