Imported Upstream version 1.1+git20141001
Imported Upstream version 1.1+git20141029