Merged in changes from dc42's firmware (0.65h and 0.65j)