rebase of master on develop

this is due to changes from apiary.io.