Apply org-version 8.0.7