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