Merge pull request #2 from cpp-netlib/0.11-devel

Update from original