foo
jar
Merge remote-tracking branches 'origin/jar' and 'origin/foo' into rc20130911004617