closes GH-781
Merge branch 'master' of github.com:Fabrik/fabrik