Add support for rotating the wattermark.
Minor reformatting.
Merge branch 'rotate-watermarks'

* rotate-watermarks:
  Minor reformatting.
  Add support for rotating the wattermark.