Merge branch '4.0-dev'
Authored by: Earnie Boyd 2013-09-15
Parents: [3e3510][721318]
Children: [027264][5d17a3]