Fix FTBFS with clang++

Forwarded from http://bugs.debian.org/757820
Merge remote-tracking branch 'upstream/master'