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