Keeping library __init__.py BaseHandler at backburner
Merge remote-tracking branch 'upstream/master'