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