Sync'd branch integration/inbound with upstream @ Fri Oct 17 03:24:42 PDT 2014