(removing debug line from previous commit)
Merge branch 'master' into unstable