Mix branch 20140623, fixes

new branch init commit