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