Merge branch 'maint-0.2.8' into maint-0.3.0

This is an "ours" merge to avoid the conflict from the 0.2.8 version
of the fix for TROVE-2017-008.