Merge remote-tracking branch 'spjoe/master' (closes PR #1921)