Merge pull request #1 from tanium/master
Merge changes from master release into dev
I need to wake up.