1217130758 - MergeBot - Merging frameworks/ex from upstream sources