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