Sync'd branch integration/inbound with upstream @ Mon Oct  6 14:06:42 PDT 2014