Merge branch 'jobson' into ts05