Synchronize with 0.9.7-stable branch

File changed.

Preview size limit exceeded, changes collapsed.