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