Merge pull request #439 from julesanchez/fix-scrollview

Do not fade-in scrollbars if scrollview node has been deleted
Merge branch 'dev-master'
Merge branch 'master' into dev-master