Merge remote-tracking branch 'origin/Irma' into Noah
Merge branch 'Noah' of https://github.com/Planetaryn/ContactList into Noah
minor changes