Sync'd branch integration/inbound with upstream @ Wed Oct  8 15:34:54 PDT 2014