@jakzal's PR is outdated, some of old commits you see is me merging the master back in his branch.