Sync'd branch integration/inbound with upstream @ Mon Oct  6 02:45:44 PDT 2014