1217130758 - MergeBot - Merging frameworks/base from upstream sources