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

v20140529