Delete null 20140725a

rebase of delete-null-20140725 branch.