Merge stable v2014.06.19