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

Upstream version 2.5.6~git20140801
changelog
Refresh patch
Switch back to dynamic num of procs
Update changelog for 2.5.6~git20140801
Merge branch 'master' into experimental
Add liblas support
Update changelog for 2.5.6~git20140801 experimental
Release script