ASL: 20141003

Fixes #1227.