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