Sync'd branch integration/inbound with upstream @ Mon Oct 13 19:26:41 PDT 2014