Update master revision to 17.10