0.8.11 merge to 0.9

work in progress. 1 date test case to fix.