Merging from Upstream (from 2014-10-15).
Updating queries, to reflect data v20121205.
Changing deployment scripts.
Bugfixing previous merge.