Merge branch '2.x' into create-afk-message

This commit is contained in:
Ali Moghnieh 2016-06-18 18:20:45 +01:00
commit 872b25e0c5