Sync'd branch integration/inbound with upstream @ Fri Oct  3 18:33:39 PDT 2014