Merge 2014.04-DockStar-WIP
Merge 2014.04-GFH-WIP