3.5 release

I think this replays the changes made to master since v3.5 on top of 3.5-release.  It would be good if people (magnate?) confirmed this - I won't roll master back until this is pulled and it's clear that's OK.