Sync'd branch integration/inbound with upstream @ Fri Oct 10 13:06:43 PDT 2014