Imported Upstream version 2.5.6~git20140801
Imported Upstream version 2.6.0
Merge tag 'upstream/2.6.0'

Upstream version 2.6.0
Usual patch refresh