Follow-on to 5fca371a616dba16f955087c4477ee229ee222d0 for #1945.
Previously skipped admin_watermarks mods to use new functionality of #1945
since there was concurrent work on it with #1970.
Now that both are done, we can wrap this up.
Merge pull request #114 from shadlaws/fix_1945_followon

Follow-on to 5fca371a616dba16f955087c4477ee229ee222d0 for #1945.
Automated update of .build_number to 316 for branch master
Last update: e17c39386b9d322f9bafd8b548ec6b94a7c5f7b5 (1 commits ago)
Merge remote-tracking branch 'upstream/master'