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