merge of latest master with fix for twinx