upstream/1.0.0+git-20141004.86285d1
888eeb87 · Merge remote-tracking branch 'origin/master' into upstream ·