Milestone: v1.0.3.1

Just a repack of v1.0.3.1 for AMO.