1228130921 - MergeBot - Merging frameworks/base from upstream sources