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

Release #1 for June 18, 2014