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