Sync'd branch integration/inbound with upstream @ Tue Oct 28 19:18:11 PDT 2014