Merge pull request #936 from oliverds/master

Watermark can't be turned on #934
Merge remote-tracking branch 'upstream/master'