synced up to commit https://github.com/BlueSpire/Durandal/commit/baa7071c2463da84fdd48dccd488ff501d29125c