Merge branch 'release/v20140511'
Merge branch 'release/v20140515'
Merge tag 'v20140515' into develop

v20140515