Sync'd branch integration/inbound with upstream @ Tue Oct 28 03:21:43 PDT 2014