Merge branch 'master' into master

Author manavortex <manavortex@gmail.com>
Author date 2018-04-12 15:34:19
Author local date 2018-04-12 17:34:19 +0200
Committer GitHub <noreply@github.com>
Committer date 2018-04-12 15:34:19
Committer local date 2018-04-12 17:34:19 +0200
Commit 33ec3a4bff345c1748bc54c3f525c6ddc2dd01b5
Tree 559f4f2fc91f30e966a0d9daf413e61cd692b2ff
Parent f38b7c74c1fbfcba83a50317e286d578b304ea3c
Parent 94ff5a2a0593c69ad6c52390c806189ae482acd1
Merge branch 'master' into master