Bram's master commit
Merge branch 'master' of https://github.com/mijnvivo/iOS

Ferdi ~ conflicts opgelost