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