Upstream changes#1

forkbot wants to merge 2 commits into

cleanweb-uk:mastercleanweb-uk/ian:masterfrom

andrew:masterandrew/ian:masterCopy head branch name to clipboard