Sync'd branch integration/inbound with upstream @ Sat Oct  4 02:04:42 PDT 2014