Sync'd branch integration/inbound with upstream @ Wed Oct  8 01:46:39 PDT 2014