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