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