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