@the Core: For some people the solution you link to has worked, but unfortunately not for me. I have tried folded paper/piece of credit card etc. For me reboot/battery problem started yesterday - from the first reboot after installing Marshmallow. I therefore - like you - blame the battery...