Merge branch 'hotfix/fix140630'
stash test commit
Merge branch 'hotfix/fix140905' into develop

Conflicts:
	sample.txt