One more
Merge branch 'master' into chrislocal

This reverts commit 737870a243d741304dc268c29fee30b64fc97dc6.
changes
changed
Merge pull request #1 from cooshtee/chrislocal

Chrislocal