fdewaghe-branch1
birdbum-branch1
Merge pull request #1 from birdbum/birdbum-branch1

birdbum-branch1
fdewaghe hotfix
Merge pull request #2 from birdbum/dev

Dev