Minor model and toolbox updates backported from 10.3

Minor model and toolbox updates backported from 10.3
Merge pull request #164 from mfunk/v10.2.2.2

Minor model and toolbox updates backported from 10.3