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