Merge branch 'develop' of github-kali.github.com:kalikaneko/leap_common into develop