Merging changes made on 1-3-2013