Merge commit 'nickm/1776_redux_v1' into maint-0.2.2