Sync'd branch integration/inbound with upstream @ Mon Oct 27 18:15:41 PDT 2014