Merge branch 'master' into master

Author manavortex <manavortex@gmail.com>
Author date 2018-02-16 14:40:05
Author local date 2018-02-16 15:40:05 +0100
Committer GitHub <noreply@github.com>
Committer date 2018-02-16 14:40:05
Committer local date 2018-02-16 15:40:05 +0100
Commit 5c82d06644401e1955a0ec17012f811a9dda2702
Tree feddce39741e0a0698f552383f99fdf53d3f16ee
Parent fd70a400932a32697dd3fce291c7826fc7c6f7e2
Parent 3f51d94375f644198ffdac7ed7164d266db0bb17
Merge branch 'master' into master