Sync'd branch integration/inbound with upstream @ Thu Oct  9 03:03:39 PDT 2014