Merge release from 2014-03-10