Imported Upstream version 1.5.0.1+git20150513
267 files changed