Merge remote-tracking branch 'pcmcia/master'