Fix for 3.4
Fix build against 3.4
Merge pull request #568 from jbrodman/master

Fix against LLVM ToT