Merge branch 'master' into next

This commit is contained in:
Ben Hilburn 2017-03-14 14:25:41 -07:00
commit 3ad77e6d6d

View File

@ -1,4 +1,4 @@
Copyright (c) 2014-2016 Ben Hilburn <bhilburn@gmail.com>
Copyright (c) 2014-2017 Ben Hilburn <bhilburn@gmail.com>
MIT LICENSE