Sync'd branch integration/inbound with upstream @ Tue Oct 28 13:54:36 PDT 2014