Sync'd branch integration/inbound with upstream @ Fri Oct  3 08:56:36 PDT 2014