Merge branch 'master' into master

Author manavortex <manavortex@gmail.com>
Author date 2018-02-19 18:28:27
Author local date 2018-02-19 19:28:27 +0100
Committer GitHub <noreply@github.com>
Committer date 2018-02-19 18:28:27
Committer local date 2018-02-19 19:28:27 +0100
Commit dcf06a12d5cc9f5f00b3e56ed49fe7184312c2a0
Tree 5fe9d0471f21d7e422743fb1abe3035a0e27532e
Parent 729ba4dc061b9eac3c38461e0470918de9534571
Parent 87dd3a680c0ec5b8a2ff85479ff4ea4d62fe4bdc
Merge branch 'master' into master