Merge branch 'jk/squelch-compiler-warning-from-funny-error-macro'