Sync'd branch integration/inbound with upstream @ Wed Oct 29 05:02:48 PDT 2014