Upstream pull 2012-11-29
Merge of upstream for 20130108
Merge branch 'upstream'
Upstream pull for 2013-01-17
Merge branch 'upstream'