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