Merge branch 'master' into dev-1.2.0
#567: filter out empty folders.
Merge branch 'dev-1.2.0' into dev
Merge branch 'dev'