Sync'd branch integration/inbound with upstream @ Wed Oct  1 06:26:41 PDT 2014