build only master
Merge branch 'master' into REST_WIP

* master:
  build only master