Master

Merged username-removed-258604 requested to merge knjakob-blomquist/ase:master into master Sep 30, 2015