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