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