Upstream pull for 2013-03-06
Merge branch 'upstream'
Upstream pull for 2013-03-20
Merge branch 'upstream'