[TIMOB-13924] Fixed module loading for ipad
Merge branch 'master' into timob-13924
Manual merge
Merge pull request #237 from bryan-m-hughes/timob-13924

[TIMOB-13924] Fixed module loading for ipad