Merge branch 'bug_249_current_skin_fallback' into experimental