Merge branch 'master' into wirelawyer_config