Merge branch 'master' of github.com:infinite-networks/InfiniteFormBundle
Fix jenkins build failures