Version bump to 2014.05.06
Merge branch 'release/2014.05.06' into develop