unbreak build when building not with gcc
Merge branch 'master' into disposable_objects