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