Merge pull request #403 from tkolhar/master

Headpin Nightly failures fixed