Merge branch 'last_day_fixes' into java1_6