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