MODULES-1219 Add Compatability for >= 4.1.0 stdlib
Merge pull request #73 from cyberious/master

MODULES-1219 Add Compatability for >= 4.1.0 stdlib