Merge branch 'release/20140810-0938'
Merge tag '20140810-0938' into develop

20140810-0939