0406140914 - MergeBot - Merging frameworks/base from upstream sources