Sync'd branch integration/inbound with upstream @ Fri Oct  3 02:17:38 PDT 2014