02c0df
Merge branches 'users/jeffm/master/for-next' and 'users/msuchanek/master/for-next' into master Pull a na ALP build fix from Jeff Mahoney. Pull a python build fix from Michal Suchánek.