Sync'd branch integration/inbound with upstream @ Wed Oct  8 20:48:43 PDT 2014