back ported changes from oldpatricka develop PR
Merge remote-tracking branch 'upstream/2014.08' into 2014.08
Merge pull request #88 from daniellemayne/2014.08

2014.08: back ported changes from oldpatricka develop PR