merge master into start-time branch