TODO - find a less hacky way of doing this
Merge remote-tracking branch 'trunk/master'