watermarks_url_path #1

Closed
acastro wants to merge 8 commits from watermarks_url_path into master