bugfixes
Merge branch 'master' into stable

* master:
  bugfixes