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