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