Catch up commit
Merge branch 'master' of https://github.com/nabil-hassan/gnosis
System notes update
catch up commit
Fixing merge issues?