1218130029 - MergeBot - Merging frameworks/base from upstream sources