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