Merge pull request #2903 from dumganhar/master

Template fixes for iOS and Windows