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