bundler 1.3.5 (from integration/bundler.git)

Change-Id: Ic20ebf100db3d6f2bab020eb661ec7a65028c892