Merge Stable for v2014.04.16