Merge pull request #408 from cyberious/MODULES-1661