The upgrade from v1.3.5 to v1.3.6 is much easier as you now have the v1.3.x series changes made ...

Using something like Beyond Compare from scootersoftware.com can make this a snap to do for file comparisson and changes, copying etc.