Merged in changes from Amberphplib 20130817.