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