Merge branch 'master' into develop
update
Merge branch 'release/20141121'