Sync'd branch integration/inbound with upstream @ Wed Oct  1 01:59:39 PDT 2014