bug fix
Merge branch 'refs/heads/kontem'
Merge remote-tracking branch 'refs/remotes/origin/master'