Imported Upstream version 0.9.2014.11.16