#234780 - by aaron, flobruit and BTMash - update to 6.x, but lots of additional changes as well, such as views support.