Bring up to date with changes in Roland's development repo