Merge "Automatic image atlasing" into devel/master