updates from sometime
Merge branch 'calendar-selection' of https://github.com/nickbolton/Bedrock into calendar-selection