Sync'd branch integration/inbound with upstream @ Thu Oct 23 05:26:03 PDT 2014