1230130349 - MergeBot - Merging frameworks/base from upstream sources