1223130108 - MergeBot - Merging frameworks/base from upstream sources