Sync'd branch integration/inbound with upstream @ Fri Oct 31 15:04:32 PDT 2014