Merge branch 'dev' of https://github.com/OfficeDev/PnP into dev