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