Upgrade to development R6

Portable classes - better to deal with this sooner rather than
later