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