Corrected compilation error (g++ 4.8.2) triggered by not found declaration
in argument-dependent lookup at the point of instantiation.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
Issue #913: Merge --master and --plugin switches

Launcher part of master/plugin switches merge.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
Merge remote-tracking branch 'lgro/saving' into saving