Commit to fast-forward mine branch

Signed-off-by: Antti-Ville Jokela <jokela.anttiville@gmail.com>
Merge branch 'master' of https://github.com/Fynze/ProjectCorePhase