Sync'd branch integration/inbound with upstream @ Wed Oct  1 17:28:34 PDT 2014