Fixed DeprecationWarning I was guilty of.
Merge branch 'master' into tagging
Updated test to support tagging.