http://issues.fluidproject.org/browse/FLUID-5370