Merge branch 'master' into stable

This commit is contained in:
Dennis Schubert 2015-10-19 18:56:56 -07:00
commit d8ed529f92

Diff content is not available