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