Sync'd branch integration/inbound with upstream @ Wed Oct  8 10:23:41 PDT 2014