Sync'd branch integration/inbound with upstream @ Mon Oct  6 04:07:39 PDT 2014