Small commit to enable merging with master
Merge branch 'master' of github.com:vwc/buildout.locomotec