Merge branch 'Plasma/5.6'

Authored by bshah on May 10 2016, 7:16 AM.

Description

Merge branch 'Plasma/5.6'

Merged Changes

CommitAuthorDetailsCommitted
82cd8f829498D1570bshah
fix serializertest by adding missing data 
May 10 2016
94f235982af5D1534sebas
make the serializer a bit more robust 
May 6 2016
338a781e71eeD1533sebas
guard access to unsafe config pointer 
May 6 2016

Empty Commit

This commit is empty and does not affect any paths.