Merge of changes 8fa75e276f638b1156e0fa1c447fc49006112f88 ba93ad762db859d04d6aa2411e4587280ca06249 160dadad7af7dee209fa85ba8cbd9106fa60c799 from Mondrian's master.
Merge of change a5c552f74ed8068a7b40fa6f2b3e9a995d94e100 from Mondrian's master.
Merge of commit 24cf3d0e2a57b88bb9550e4bccd8c8bb34c6d9db form Mondrian's master.