Merge pull request #4429 from andywhite37/master

Jan Aagaard Meier
2015-09-09T16:18:18+02:00

Rename Instance private options and __options