Merge branch 'release/release-25-9-2014'
Merge branch 'release/patch-11-26-2014'
oops