Imported Upstream version 2.4.1054
Merge commit 'upstream/2.4.1054'

* commit 'upstream/2.4.1054':
  Imported Upstream version 2.4.1054
Update unreleased to 2.4.1054-1
Update debian/copyright to reflect missing Apache license references.