Merge branch 'master' into No_movement_mode
[naja.git] / naja / __init__.py