Merge branch 'master' into s_skinprovements

This commit is contained in:
Alam Ed Arias 2016-07-16 16:04:10 -04:00
commit e393b12cec