merge master again (2.0-10 changelog only)