Sync'd branch integration/inbound with upstream @ Fri Oct  3 17:25:42 PDT 2014