Sync'd branch integration/inbound with upstream @ Fri Oct 31 07:20:38 PDT 2014