Merge pull request #5 from jacobsalmela/master

Upstream sync
This commit is contained in:
Dan Schaper 2015-12-06 14:36:26 -08:00
commit debb5aeed6

Diff Content Not Available