Merge stable for v2014.03.10