Merge pull request #412 from hynek/master

2016 snook up on us