Pre-holiday changes
Merge branch 'master' of https://github.com/nabil-hassan/gnosis