Patching for hipchat fork