- Work around GCC 4.8 bug 54570
Merge branch 'maint'