1221131150 - MergeBot - Merging frameworks/base from upstream sources