Bug 1094146

Fixed due to upstream: http://www.redmine.org/issues/17235