Fix patches > 255 chars on st2
Merge branch 'master' into st3_package