Merge branch 'maint'

This is an 'ours' merge since we should not warn for
triple double-quote strings on 'master'.  The implementation
of the feature will be merged later.