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