Merge branch 'master' into sm1215
Revert "Merge branch 'sm1215'"

This reverts commit 932c9119d5bf3deb72c14fcc6a32062235cca853, reversing
changes made to b9444ef150102ce5f6e878ec204b55dcf0e719ad.
Revert 932c911..6bbd99d

This rolls back to commit 932c9119d5bf3deb72c14fcc6a32062235cca853.
minor fix
Merge pull request #1 from lopezj18/sm1215

Sm1215