Merge remote-tracking branch 'origin/efcp' into newmaster
Authored by: Marcel Marek 2015-02-02
Parent(s): [34aaa4][fd20f2]
Child(ren): [05b0e6]