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