Merge remote-tracking branch 'origin/test' into release-candidate

* origin/test:
  BZ-13368 Added additional expression
Merge branch 'production' into DEV20140925