merge may 29 2013