Resolved conflict in Handlers.php
Resolved conflict in Handlers.php

localheinz/Stash,csburton/Stash,jaredtking/Stash,AndrewCarterUK/Stash,bankiru/Stash,theUniC/Stash,bankiru/Stash,tedious/Stash,alawnchen/Stash,jaredtking/Stash,localheinz/Stash,theUniC/Stash,AndrewCarterUK/Stash,alawnchen/Stash,graphis/Stash,tedious/Stash,csburton/Stash,andrerom/Stash,andrerom/Stash,graphis/Stash