Sync'd branch integration/inbound with upstream @ Fri Oct 31 01:54:43 PDT 2014