Final commit before 1.3.0

(probably)