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