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