Updated for Lightroom 5.4 / ACR 8.4