Allow unicode in .orderBy(u'-column')
Merge branch '1.5' into 1.6
Merge branch '1.6' into 1.7