asl 20140618

Closes #981.