Sync'd branch integration/inbound with upstream @ Fri Oct  3 01:07:51 PDT 2014