Merge branch 'bug_387_small_spinner_fix' into experimental