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