Sync'd branch integration/inbound with upstream @ Fri Oct  3 11:41:43 PDT 2014