Sync'd branch integration/inbound with upstream @ Wed Oct  8 01:18:43 PDT 2014