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