Sync'd branch integration/inbound with upstream @ Wed Oct  8 14:29:59 PDT 2014