testclean1
Merge branch 'release/20141214'