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