Sync'd branch integration/inbound with upstream @ Mon Oct 27 08:05:42 PDT 2014