Import for Upstream 2013-04-12 pre 2.7.1
Upstream 2.7.1-alpha-1