Merge tag 'release/2014-03-10_08-37-00' into develop

release/2014-03-10_08-37-00
update to release version: 1.5.0.31
Merge branch 'release/2014-03-10_09-01-37'