clean up and synchronize with 0.9.6-stable

File changed.

Preview size limit exceeded, changes collapsed.