merged conflicts by hand
Merge branch 'nshimiye-master'