Merge branch 'rc-20140825' into release