proton 2016-03-02

@dvcrn: I narrowed this down to the HTML layer

@austincrft: that helps a lot! Thank you

Sorry for being a little short on time. At a conference right now that eats all the free time I have