Merge tag 'upstream/1.5.0.1+git20150316' into debian-experimental

Upstream version 1.5.0.1+git20150316