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

Release #1 for August 4, 2014 2014.8.4.1