Merge branch 'master' into v1.1.0-release
updated reflist for v1.1
Merge remote-tracking branch 'up/master' into develop

in release 1.1, master was updated without flowing from develop to master. this merges those master commits back into develop.
Merge pull request #284 from gidden/dev-merge

Dev merge