Merge pull request #124 from jameswennmacher/umobile-trunk

Merge rel-4-0-patches into umobile_trunk