Try to fix stupid clang cpp incompatibility (gh-154)

--HG--
extra : rebase_source : 4d92fc2b96527581ecba1a9d09e93a2c6ae31682
extra : amend_source : f2b002e759d692bc9bca962484123a7857ebbb02
Bump version to 0.6.2.1
Added tag 0.6.2.1 for changeset 52038e5c0ea3
Merge