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