*   4712de3 (HEAD, master) Merge remote-tracking branch 'origin/master'

|\  

| *   daf8d07 (upstream/master, origin/master, origin/HEAD, refactors) Merge p

ull request #608 from Lego3/installer_unicode

| |\  

| | * b33bd44 Make use of Unicode support from NSIS 3.0

* | | ca37324 Make use of Unicode support from NSIS 3.0

|/ /  

* |   8c1e774 Merge pull request #607 from Lego3/installer_updates

|\ \  

| * | bb6e5b8 Updated Windows installer to only take into account one executable

* | |   ac3d9e8 Merge pull request #355 from Alberth289346/animviewer_vert_scrollbar

|\ \ \  

| * | | dc02545 Fix: Add vertical scrollbar to the sprite display.

* | | |   9d2b555 Merge pr #601 from wolfy1339/translate-french