0319142353 - MergeBot - Merging frameworks/base from upstream sources