Merge branch 'release/2013-04-13'
Don't check whether we're on the master branch since Teamcity will always check out master anyway
Merge branch 'master' of https://github.com/Q42/q42.nl
Merge branch 'master' into develop