Merge branch 'double_render_fix' into change-master
version bump to 0.5.7-change