Sync'd branch integration/inbound with upstream @ Tue Oct 28 08:16:42 PDT 2014