Merge branch 'master' into master

Author manavortex <manavortex@gmail.com>
Author date 2018-02-12 16:44:57
Author local date 2018-02-12 17:44:57 +0100
Committer GitHub <noreply@github.com>
Committer date 2018-02-12 16:44:57
Committer local date 2018-02-12 17:44:57 +0100
Commit 632d2eaa971ea8f9a4341706507a954c7e3dd52a
Tree 2094e4b751f4329789c2c4d936dc75f4c0d8581f
Parent 16e9d89ebed8356d7818ed050de309b2604def35
Parent d314bfaed667b49e523eaef4eb24f8874fac90d4
Merge branch 'master' into master