Uploading MR#48 as a patch.
Tested with "2.0.5", and with "2.0.x-dev"