Sync'd branch integration/inbound with upstream @ Wed Oct  8 14:18:51 PDT 2014