trawling through tickets, applying patch …

trawling through tickets, applying patches, punting new features to 2.6