Sync'd branch integration/inbound with upstream @ Mon Oct 27 03:11:40 PDT 2014