Merging 1194 from trunk
Updating externals