1.2.0

jakebonk
2017-07-11T17:24:45Z

Merge remote-tracking branch 'origin/master'