Merge branch 'master' of github.com:starteam/starx
Merge branch 'master' into develop

* master: