Checking in changes prior to tagging of version 0.20140530.

Changelog diff is: