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