fix for #3219  build errors on Yosemite version of clang

over-the-shoulder by @danielmewes
Merge branch 'next' into sam_2134_iii