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