Merge testing to master?

Testing has been testing since 7th of last month.