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