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