# HG changeset patch
# User Windel Bouwman
# Date 1394208621 -3600
# Node ID 742588fb8cd699c48f1ab43c345b632a5ce81668
# Parent  11c5a8a70c02a060afed3a7c9e15abfe2913b2a8# Parent  3bb7dcfe5529a76b80d11f19a4d67138a2b76515
Merge into devel branch