Update from freeminer:master May 19, 2014