Imported Upstream version 1.4.0.beta6