1.1.7

jakebonk
2017-07-01T19:27:43Z

Merge remote-tracking branch 'origin/master'