3.5.1 dev

Moving 3.5.1 branch nto master