Patched module includes for current 1.0-dev branch

...917746d41814534986080b3e1d4e21ee254