https://github.com/ezsystems/DemoBundle/pull/41