Merge branch 'master' into gitter-badge-1

Former-commit-id: 00382a8e1f2682d4dc99fa8de81cdcce98c262cc [formerly c6d60b00dbab45372afd6d80d3e6cda54c5aeee6]
Former-commit-id: 6c367257e8e009af1387bfc0996379155bdc32da
This commit is contained in:
Raul Jordan 2018-01-13 17:32:13 -05:00 committed by GitHub
commit e63320f199

Diff Content Not Available