Ensure up-to-date for 'normal' release
Merge pull request #233 from mballance-sf/master

Ensure up-to-date for 'normal' release