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