# HG changeset patch
# User Windel Bouwman
# Date 1393687947 -3600
# Node ID 1378c4b027a096c5338f9529ce03503faf3168d1
# Parent  6ee17c4dd6b8eff2c3c690bf213e46cf9cd45ea7# Parent  11c5a8a70c02a060afed3a7c9e15abfe2913b2a8
Merge devel branch