Upstream version 20130227+rhino