Rebased off master
Rebased off master

sh4wn/vispy,michaelaye/vispy,bollu/vispy,drufat/vispy,QuLogic/vispy,sbtlaarzc/vispy,dchilds7/Deysha-Star-Formation,srinathv/vispy,bollu/vispy,julienr/vispy,kkuunnddaannkk/vispy,inclement/vispy,jay3sh/vispy,ghisvail/vispy,Eric89GXL/vispy,kkuunnddaannkk/vispy,srinathv/vispy,michaelaye/vispy,QuLogic/vispy,julienr/vispy,sbtlaarzc/vispy,hronoses/vispy,jdreaver/vispy,RebeccaWPerry/vispy,sh4wn/vispy,RebeccaWPerry/vispy,drufat/vispy,inclement/vispy,QuLogic/vispy,ghisvail/vispy,inclement/vispy,julienr/vispy,hronoses/vispy,jdreaver/vispy,jay3sh/vispy,michaelaye/vispy,Eric89GXL/vispy,bollu/vispy,dchilds7/Deysha-Star-Formation,drufat/vispy,srinathv/vispy,dchilds7/Deysha-Star-Formation,RebeccaWPerry/vispy,sbtlaarzc/vispy,jdreaver/vispy,ghisvail/vispy,sh4wn/vispy,Eric89GXL/vispy,hronoses/vispy,kkuunnddaannkk/vispy,jay3sh/vispy