Merge pull request #3584 from neilLasrado/develop

Minor fixes