Merge branch 'master' of git://github.com/tferr/ASA

Attempt to merge git://github.com/tferr/ASA since the previous attempt (SHA: 7e3c9988d23ab9130845d8177c68fc020c804901) had unresolved conflicts. https://groups.google.com/d/topic/fiji-devel/AzcvWCTdR3I/discussion