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