Imported Upstream version 0.03.20140426.g1ba9a8e