fdewaghe-featureBranch1
Merge pull request #1 from fdewaghe/fdewaghe-featureBranch1

fdewaghe-featureBranch1
Merge pull request #2 from birdbum/master

merging fdewaghe-featureBranch1 to stable