01d496 Merge remote-tracking branch 'origin/master' into fix_save_palette_dialog

Merged and Committed by shun_iwasawa 9 years ago
    Merge remote-tracking branch 'origin/master' into fix_save_palette_dialog