Merge trunk into branch "wii-u"