Have origin changes up-to 03-05-16
Revert eeafa6d90df04799bdbc84b253f50d4f1ea630a2 from orig (parts of
which were applied manually) because this will come in through merging
with master.
8 files changed