Merge branch 'master' into dockerize

This commit is contained in:
Simon Fortier 2017-12-31 09:54:41 -05:00 committed by GitHub
commit 6b2e3c17ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

Diff Content Not Available