fix for llvm 3.2
Merge branch 'develop' into rate