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