Sync'd branch integration/inbound with upstream @ Wed Oct  8 17:16:38 PDT 2014