Attempting fix for #568.
Merge branch 'master' into davis_master