Merge branch 'master' into master

Author manavortex <manavortex@gmail.com>
Author date 2018-02-22 17:50:21
Author local date 2018-02-22 18:50:21 +0100
Committer GitHub <noreply@github.com>
Committer date 2018-02-22 17:50:21
Committer local date 2018-02-22 18:50:21 +0100
Commit bb5ed9305c52db71d06218248f9c396b2f93c4f1
Tree 6096dab55a53501cb3a0d60288f6ae956c9e6ff5
Parent 390c0aac4bdc1f27f0ac6a1e62d6366b39bd3a97
Parent c1b444213c45e39a22a50518aa44d74e55ebb31d
Merge branch 'master' into master