Merged the newest commits of MASTER with this fork.