Merging the bug/v4 branch into the master branch on 2014 06 22 10:10