Sync'd branch integration/inbound with upstream @ Wed Oct  1 18:09:47 PDT 2014