Some updates and split of files to separate steps.
Authored by: qvanheerden 2014-01-29
Parent: [r27743]
Child: [r27745]