From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 3 Apr 2015 23:16:59 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-6585
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=2210ff0ed57c5b0864ae46fcfcf182de1ca129f3;p=tmp%2Fjakarta-migration.git

Merge remote-tracking branch 'upstream/master' into CSPACE-6585
---

2210ff0ed57c5b0864ae46fcfcf182de1ca129f3