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

Update from original