Merge remote-tracking branch 'origin/5.1'

Authored by antonanikin on Jan 9 2017, 7:50 AM.

Description

Merge remote-tracking branch 'origin/5.1'

Merged Changes

CommitAuthorDetailsCommitted
ae7a1b7b4b97D4035antonanikin
Set default scope for ProblemStore 
Jan 9 2017
cf5a4c469d2ckossebau
Fix layout accidently being tried to replace OutputPage's main layout 
Jan 8 2017