Resolved merge-conflict with changes pulled from grendel