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