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