Merge branch 'dandev20140213'
Merge branch 'master' into dandev20140213