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