Fixing terrible merge comflicts from other people
Merge pull request #1204 from jdalphon/master

Fixing terrible merge comflicts from other people