Sync'd branch integration/inbound with upstream @ Mon Oct  6 10:45:39 PDT 2014