sage

877f3b45 - Merge branch 'develop' into is_graphic/regular