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