Sync'd branch integration/inbound with upstream @ Wed Oct  8 19:58:41 PDT 2014