Update to to SpecialSource 1.6-SNAPSHOT