Merged changes from arrs_editor_20140313_vc
Merge branch 'arrs_editor_20140313_vc'