Sync'd branch integration/inbound with upstream @ Thu Oct  2 05:25:37 PDT 2014