Merge branch 'master' into dev_bugfix
Merge branch 'bugfix' of https://github.com/Nuffield/fox.git into dev_bugfix
fMerge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
Merge branch 'bugfix' of https://github.com/Nuffield/fox into dev_bugfix

Conflicts:
	Programme.community
Merge branch 'bugfix' of https://github.com/Nuffield/fox.git into
dev_bugfix

Conflicts:
	Programme.community
Merge pull request #10 from Nuffield/dev_bugfix

Dev bugfix