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