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

v20140610