Sync'd branch integration/inbound with upstream @ Wed Oct 22 05:35:40 PDT 2014