Merge commit 'har/laforge'