Sync'd branch integration/inbound with upstream @ Fri Oct 31 10:26:36 PDT 2014