Rightside -> master

Correction for wrong-way merge (previously merged ```master``` into ```right side```, now properly merging ```rightside``` into ```master```).