Merge branch '1448-g-error-secretly-doesnt-abort' into 'master'