Roll back premature commit
Merge branch 'topic_translation_test' of github.com:buttercoin/buttercoin into topic_translation_test