Merge branch 'release/20140904'
Merge tag '20140904' into develop

20140904