Unit test env
Merge branch 'master' of git://github.com/crossborne/ParameterBundle