David Baker 7d161de35b Partial merge of develop to experimental ...

Does not include #2336 as the file has been moved out from underneath it:
will do this separately

2019-01-03 15:02:58 +00:00

..

lock-warning.svg

Partial merge of develop to experimental

2019-01-03 15:02:58 +00:00