Integrated submenu into canvas menu.
Merge remote-tracking branch 'origin/master'