Work around GCC bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58192
Update docs for 0.2.1 release.
Merge branch 'master' into benchmark