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