Merge current Stable for v2014.07.29