Auto merge of #964 - npmccallum:master, r=alexcrichton

Default RHS to Self for Div and Shl

This fixes a consistency issue with the other operator traits.