Merge pull request #880 from sylus/master

Updates to modules
Update modules.