issue 946 from partial develop fixes (markers update)

- this takes PR  #951 and merges it without a full commit
- unlike 2.1.X markers does not evaluate expressions here

This resolves #946 on master 2.0.X
@gitnik 
@kandizzy 
@cthrax 
@aesnyder 

@kandizzy I notice there are some commits from your side on develop should they be removed? Are they to be considered 2.1.X changes or 2.0.X? If it is breaking then it should be 2.1.X. If it is not then this merge into is 2.0.X (master) is ok.