Merge pull request #1669 from Azaezel/guiBitmapBarCtrl