Sync'd branch integration/inbound with upstream @ Tue Oct 28 07:12:39 PDT 2014