Merge from spraycan_merge2/decal_refactor