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