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

Upstream version 2.5.6~git20140801