Sync'd branch integration/inbound with upstream @ Wed Oct  1 05:16:39 PDT 2014