Synced with Framework update
Merge branch 'master' of https://github.com/PeterRaeves/conferences