catch up with devel branch as much as possible to ease merging forthcoming changes between both branches

Author: sammefford