Merge branch 'master' into master

This commit is contained in:
ᴠɪᴄᴛᴏʀ ʙᴊᴇʟᴋʜᴏʟᴍ 2017-04-21 19:23:41 +02:00 committed by GitHub
commit 31f78ef592