bitovi/canjs — pull request #1340 by daffl (2014-11-24 18:08:53+00:00)
Title: Merging v2.1.4 into minor

Merge the changes from master (v.2.1.4) into minor.