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