Merge branch 'release/2014-06-20'
Merge branch 'release/2014-06-24'
Merge remote-tracking branch 'upstream/master' into develop
wear banner