merge master 27 Feb 14