Merge pull request #369 from peternewman/trivial-fixes

Add and use a GetMandatoryPIDWithDataMixin mixin