Merge pull request #422 from tonyrd/master

making sure all is up to date for Build & Price staging