update to released version
Merge branch 'master' into editor_angularjs