12ad911 Merge branch 'develop' of github.com:varya/varya.github.com into develop