merge the changes related to sourceparcellate, see http://bugzilla.fcdonders.nl/show_bug.cgi?id=1775