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