Merge branch 'release1.3'
* release1.4, 20140307-132303, update
* release1.4, 20140307-132304, update
Merge branch 'master' into release1.4
Merge branch 'release1.4' into develop

Conflicts:
	abc.txt