Merge branch 'gp.2013.09.25a' into HEAD