Bumped to 0.13.4.
Merge branch 'master' into c++11
Fixed C++11 issues.