update for nette 2.3 compatibility
add changes from upstream