Sync'd branch integration/inbound with upstream @ Sat Oct  4 07:17:40 PDT 2014