ICP1 HOC: 2014-03-07
OIS: wpo 2014-04-10
Merge branch 'master' of github.com:Wardje/vub

Forgot to pull before committing.