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