[CI-SKIP] Merge branch 'master' into pre/1.13

Doesn't actually change anything, these patches were already merged and
just getting git metadata to recognize that.

Dieser Commit ist enthalten in:

Aikar

2018-08-11 09:44:34 -04:00

Ursprung 5d42c9c99d 895a4dcafc

Commit 2dddf8acbb

Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden

GPG-Schlüssel-ID: 401ADFC9891FAAFE