Sync'd branch integration/inbound with upstream @ Fri Oct 31 18:33:29 PDT 2014