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